auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 21:06:12 +0000 (22:06 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 17 Dec 2012 21:06:12 +0000 (22:06 +0100)

Trivial merge